bitkeeper revision 1.1389.8.1 (427a2dc0yjvEz3OVwiOMxO61skasFg)

Fix installing fixmap_nocache entries, as used by PCI_MMCONFIG.
fixmap.h:
  Address passed to set_fixmap_nocache is a machine-address -- install
  it as such.
Kconfig:
  Re-enable PCI_MMCONFIG.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
index 3e6ed34755911176e03114a59f66ab814d32a7f6..3ed45ade7bfdc5b060d116a5961e49220fd3f7de 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
@@ -788,7 +788,7 @@ config PCI_MMCONFIG
        bool
        depends on PCI && (PCI_GOMMCONFIG || (PCI_GOANY && ACPI))
        select ACPI_BOOT
-       default n
+       default y
 
 source "drivers/pci/pcie/Kconfig"
 

diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h
index cce81a570c35d312dceade494419f323ac2be715..c79f8a94a0340531ac4aff7bf23aa7939ab9f89d 100644 (file)
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h
@@ -117,7 +117,7 @@ extern void __set_fixmap_ma (enum fixed_addresses idx,
  * Some hardware wants to get fixmapped without caching.
  */
 #define set_fixmap_nocache(idx, phys) \
-               __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)
+               __set_fixmap_ma(idx, phys, PAGE_KERNEL_NOCACHE)
 
 #define clear_fixmap(idx) \
                __set_fixmap(idx, 0, __pgprot(0))

diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h
index dbb7043961483282648efffc5630926ab2ab0fa9..1947a095447bb3170d09272d68af1ab28a0dc609 100644 (file)
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h
@@ -75,7 +75,7 @@ extern void __set_fixmap_ma (enum fixed_addresses idx,
  * Some hardware wants to get fixmapped without caching.
  */
 #define set_fixmap_nocache(idx, phys) \
-               __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)
+               __set_fixmap_ma(idx, phys, PAGE_KERNEL_NOCACHE)
 
 #define clear_fixmap(idx) \
                 __set_fixmap(idx, 0, __pgprot(0))